Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 Jan 2012 03:59:34 +0000 (19:59 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 Jan 2012 03:59:34 +0000 (19:59 -0800)

Trivial merge